Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:09:17 +0000 (09:09 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:09:17 +0000 (09:09 -0700)
commitd0c7951f498f38f95909abcba755fa8c3da38a07
treeb6b18e48e3c5c98cf5d5b5312610ecf0858c6dfb
parentf630d689e29adb26e2c3bcf3ada28e776373ee79
parent631c06db134089a5aaa1e8dd997250ee5c7f0fc4
Merge from trunk.